Skip to content

Commit

Permalink
rolfmill renamed to much more clear name - 3axis-tutorial
Browse files Browse the repository at this point in the history
  • Loading branch information
rolf committed Dec 8, 2018
1 parent e4495fe commit bf07cb5
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 15 deletions.
@@ -1,5 +1,7 @@
#!/usr/bin/python

# Rolf Redford, Nov 2018

#import libraries
from vismach import *
import hal
Expand All @@ -21,7 +23,7 @@ s.poll()
# tooldiameter isn't really used but if you are using 2.8 you can make couple changes
# in this file, and uncomment last line in HAL file.
# add joints. Mill has 3.
c = hal.component("rolfmill")
c = hal.component("3axis-tutorial")
c.newpin("jointX", hal.HAL_FLOAT, hal.HAL_IN)
c.newpin("jointY", hal.HAL_FLOAT, hal.HAL_IN)
c.newpin("jointZ", hal.HAL_FLOAT, hal.HAL_IN)
Expand Down
Expand Up @@ -52,17 +52,17 @@ net tool-changed iocontrol.0.tool-changed <= hal_manualtoolchange.changed
net tool-number iocontrol.0.tool-prep-number => hal_manualtoolchange.number
net tool-prepare-loopback iocontrol.0.tool-prepare => iocontrol.0.tool-prepared

# start rolfmill vismach addition
loadusr -W ./rolfmill
# start 3axis-tutorial vismach addition
loadusr -W ./3axis-tutorial

# "wire" linuxcnc pins to joints defined in vismach file
net j0 joint.0.pos-fb => rolfmill.jointX
net j1 joint.1.pos-fb => rolfmill.jointY
net j2 joint.2.pos-fb => rolfmill.jointZ
net j0 joint.0.pos-fb => 3axis-tutorial.jointX
net j1 joint.1.pos-fb => 3axis-tutorial.jointY
net j2 joint.2.pos-fb => 3axis-tutorial.jointZ

#tool sinput
net tool_len rolfmill.toollength <= motion.tooloffset.z
#net tool_rad halui.tool.diameter rolfmill.tooldiameter # Only in 2.8 or later
net tool_len 3axis-tutorial.toollength <= motion.tooloffset.z
net tool_rad halui.tool.diameter 3axis-tutorial.tooldiameter # Only in 2.8 or later



Expand Down
Expand Up @@ -14,7 +14,7 @@
VERSION = 1.0

# Name of machine, for use with display, etc.
MACHINE = rolfmill
MACHINE = 3axis-tutorial

# Debug level, 0 means no messages. See src/emc/nml_int/emcglb.h for others
# DEBUG = 0x7FFFFFFF
Expand Down Expand Up @@ -42,7 +42,7 @@ POSITION_FEEDBACK = ACTUAL
MAX_FEED_OVERRIDE = 1.2
MAX_SPINDLE_OVERRIDE = 1.0
# Prefix to be used
PROGRAM_PREFIX =/home/rolf/linuxcnc/nc_files
PROGRAM_PREFIX =/home/rolf/linuxcnc/nc_files #need to change

# Introductory graphic
INTRO_GRAPHIC = linuxcnc.gif
Expand All @@ -66,7 +66,7 @@ py = python
[RS274NGC]

# File containing interpreter variables
PARAMETER_FILE = rolfmill_mm.var
PARAMETER_FILE = 3axis-tutorial_mm.var

# Motion control section ------------------------------------------------------
[EMCMOT]
Expand Down Expand Up @@ -102,7 +102,7 @@ CYCLE_TIME = 0.001

# list of hal config files to run through halcmd
# files are executed in the order in which they appear
HALFILE = rolfmill.hal
HALFILE = 3axis-tutorial.hal

# list of halcmd commands to execute
# commands are executed in the order in which they appear
Expand Down Expand Up @@ -220,4 +220,4 @@ MIN_LIMIT = -240.0
MAX_LIMIT = 0.001
HOME_OFFSET = 0.0

# section for main IO controller parameters -----------------------------------
# section for main IO controller parameters -----------------------------------
2 changes: 2 additions & 0 deletions configs/sim/axis/vismach/3axis-tutorial/README
@@ -0,0 +1,2 @@
A simple vismach 3 axis mill example built using primitives.
Comments is in 3axis-tutorial vismach file, and some in 3axis-tutorial.hal explains step by step the process to build.
File renamed without changes.
2 changes: 0 additions & 2 deletions configs/sim/axis/vismach/rolfmill/README

This file was deleted.

0 comments on commit bf07cb5

Please sign in to comment.